🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements #5774

chrischdi · 2025-11-27T14:38:41Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

Release note:

NONE

chrischdi · 2025-11-27T15:34:28Z

/test pull-cluster-api-provider-aws-e2e-blocking

chrischdi · 2025-11-27T21:13:01Z

/retitle 🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements

/test pull-cluster-api-provider-aws-e2e

chrischdi · 2025-11-28T06:20:42Z

/retest

LiangquanLi930 · 2025-11-28T07:59:00Z

controllers/awsmachinetemplate_controller.go

+func (r *AWSMachineTemplateReconciler) machineSetToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request {
+	md, ok := o.(*clusterv1.MachineSet)
+	if !ok {
+		return nil
+	}
+
+	// Check if it references an AWSMachineTemplate
+	if md.Spec.Template.Spec.InfrastructureRef.Kind != awsMachineTemplateKind {
+		return nil
+	}
+
+	// Return reconcile request for the referenced AWSMachineTemplate
+	return []ctrl.Request{
+		{
+			NamespacedName: client.ObjectKey{
+				Namespace: md.Namespace,
+				Name:      md.Spec.Template.Spec.InfrastructureRef.Name,
+			},
+		},
+	}
+}


func (r *AWSMachineTemplateReconciler) kubeadmControlPlaneToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request func (r *AWSMachineTemplateReconciler) machineDeploymentToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request func (r *AWSMachineTemplateReconciler) machineSetToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request

These three functions are very similar. Should we refactor them a bit, similar to how we handle objectToAWSMachineTemplate?

I'd prefer to prioritize merging this if it comes back green, in the interest of getting the release out. But let's see what @chrischdi says

Imho not worth the complexity compared to these simple functions.

damdo

A couple of non blocking nits

/lgtm

controllers/awsmachinetemplate_controller.go

k8s-ci-robot · 2025-11-28T08:59:02Z

LGTM label has been added.

Git tree hash: d422856fc8bdd4edd2300244a6a9b0cd70be5549

damdo

/lgtm

TY

k8s-ci-robot · 2025-11-28T10:22:33Z

LGTM label has been added.

Git tree hash: ce26c1c04448c4b7076ed93ae7fcfdea1eb1a2cd

richardcase

Thanks again @chrischdi

It would be good to move the predicate to a shared package somewhere but we don't need to hold the release up for that.

/approve

richardcase · 2025-11-28T10:27:51Z

controllers/awsmachinetemplate_controller.go

 			&clusterv1.MachineDeployment{},
 			handler.EnqueueRequestsFromMapFunc(r.machineDeploymentToAWSMachineTemplate),
+			// Only emit events for creation to reconcile in case the MachineDeployment got created after the AWSMachineTemplate was reconciled.
+			builder.WithPredicates(predicate.Funcs{


Could we move this predicate somewhere so its reusable? Especially as its used twice here.

I added it as var and used it here for now. I did not see a dedicated predicates package as we have in CAPI and currently we only need it here.

k8s-ci-robot · 2025-11-28T10:30:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [richardcase]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…nd e2e test improvements

damdo

/lgtm

k8s-ci-robot · 2025-11-28T10:47:20Z

LGTM label has been added.

Git tree hash: 499cfebd6966332847b3334b42bf7599c7388c46

chrischdi · 2025-11-28T11:31:40Z

/retest

k8s-ci-robot · 2025-11-28T11:33:39Z

@chrischdi: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-aws-e2e	`151d33e`	link	false	`/test pull-cluster-api-provider-aws-e2e`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

damdo · 2025-11-28T12:46:46Z

/test pull-cluster-api-provider-aws-e2e-blocking

damdo · 2025-11-28T13:00:36Z

/test pull-cluster-api-provider-aws-e2e

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. needs-priority labels Nov 27, 2025

k8s-ci-robot requested review from AndiDog and dlipovetsky November 27, 2025 14:38

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 27, 2025

chrischdi force-pushed the pr-autoscale-ms-e2e-refactor branch from f4098f8 to 151d33e Compare November 27, 2025 21:12

k8s-ci-robot changed the title ~~[WIP] 🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements~~ 🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements Nov 27, 2025

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 27, 2025

LiangquanLi930 reviewed Nov 28, 2025

View reviewed changes

damdo reviewed Nov 28, 2025

View reviewed changes

controllers/awsmachinetemplate_controller.go Outdated Show resolved Hide resolved

controllers/awsmachinetemplate_controller.go Outdated Show resolved Hide resolved

k8s-ci-robot assigned damdo Nov 28, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2025

chrischdi force-pushed the pr-autoscale-ms-e2e-refactor branch from 151d33e to f1ea53a Compare November 28, 2025 09:12

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2025

k8s-ci-robot requested a review from damdo November 28, 2025 09:12

damdo reviewed Nov 28, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2025

richardcase reviewed Nov 28, 2025

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 28, 2025

chrischdi force-pushed the pr-autoscale-ms-e2e-refactor branch from f1ea53a to 06f3c98 Compare November 28, 2025 10:44

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2025

k8s-ci-robot requested a review from damdo November 28, 2025 10:44

autoscaling: try to gather the version information from MachineSets a…

2a454ad

…nd e2e test improvements

chrischdi force-pushed the pr-autoscale-ms-e2e-refactor branch from 06f3c98 to 2a454ad Compare November 28, 2025 10:45

damdo reviewed Nov 28, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2025

k8s-ci-robot merged commit c8e04c8 into kubernetes-sigs:main Nov 28, 2025
17 of 18 checks passed

🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements #5774

🌱 autoscaling: try to gather the version information from MachineSets and e2e test improvements #5774

Uh oh!

Conversation

chrischdi commented Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrischdi commented Nov 27, 2025

Uh oh!

chrischdi commented Nov 27, 2025

Uh oh!

chrischdi commented Nov 28, 2025

Uh oh!

LiangquanLi930 Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

damdo Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chrischdi Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

k8s-ci-robot commented Nov 28, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Nov 28, 2025

Uh oh!

richardcase left a comment

Choose a reason for hiding this comment

Uh oh!

richardcase Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

chrischdi Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Nov 28, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Nov 28, 2025

Uh oh!

chrischdi commented Nov 28, 2025

Uh oh!

k8s-ci-robot commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Nov 28, 2025

Uh oh!

damdo commented Nov 28, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

chrischdi commented Nov 27, 2025 •

edited

Loading

damdo Nov 28, 2025 •

edited

Loading

chrischdi Nov 28, 2025 •

edited

Loading

k8s-ci-robot commented Nov 28, 2025 •

edited

Loading